Remove conflicts
authorIceyer <me@iceyer.net>
Mon, 31 Jul 2017 04:55:22 +0000 (12:55 +0800)
committerIceyer <me@iceyer.net>
Mon, 31 Jul 2017 04:55:22 +0000 (12:55 +0800)
commitf4e20a5c936efb574dbfd26fd8c10bd6a066198c
tree06891c7996b11a685a401691836256bfa41231e9
parentdb108e02d4bc74cbce33c4c2e6eabaa84f56792b
Remove conflicts

Change-Id: I9757b7b7592b906e1d21159f0ba286ec00e4d410
debian/control